merge trunk
authorKenichi Handa <handa@m17n.org>
Tue, 28 Dec 2010 11:48:27 +0000 (20:48 +0900)
committerKenichi Handa <handa@m17n.org>
Tue, 28 Dec 2010 11:48:27 +0000 (20:48 +0900)

Trivial merge